]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
loginDialog: add support for auth without username / fix Not Listed?
authorRay Strode <rstrode@redhat.com>
Thu, 22 Aug 2013 19:12:46 +0000 (15:12 -0400)
committerRay Strode <rstrode@redhat.com>
Thu, 22 Aug 2013 19:40:55 +0000 (15:40 -0400)
commit 93f072d1fcf578c4e7550bd755e84bd46abcd493 attempted to
add support for auth without a username to the login screen, but
do to a messed up rebase only partially added it.

This commit fixes that.

https://bugzilla.gnome.org/show_bug.cgi?id=706607

js/gdm/loginDialog.js

index 0cec9df8343c8e0c3cf30551dbca426dc5d878d8..d4ff019affc4300c25f2924c1a7623c1f0826234 100644 (file)
@@ -475,11 +475,7 @@ const LoginDialog = new Lang.Class({
                                                 x_align: St.Align.START,
                                                 x_fill: true });
 
-        this._notListedButton.connect('clicked',
-                                      Lang.bind(this, function() {
-            this._authPrompt.cancelButton.show();
-            this._hideUserListAndLogIn();
-        }));
+        this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAskForUsernameAndBeginVerification));
 
         this._notListedButton.hide();
 
@@ -595,12 +591,11 @@ const LoginDialog = new Lang.Class({
 
         this._user = null;
 
-        if (this._disableUserList) {
-            this._authPrompt.cancelButton.hide();
-            this._hideUserListAndLogIn();
-        } else {
+        if (!this._disableUserList &&
+            beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME)
             this._showUserList();
-        }
+        else
+            this._hideUserListAndBeginVerification();
     },
 
     _onDefaultSessionChanged: function(client, sessionId) {